Autogenerated HTML docs for v2.4.0-rc1
diff --git a/git-rebase.txt b/git-rebase.txt index d728030..47984e8 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -362,7 +362,9 @@ -p:: --preserve-merges:: - Instead of ignoring merges, try to recreate them. + Recreate merge commits instead of flattening the history by replaying + commits a merge commit introduces. Merge conflict resolutions or manual + amendments to merge commits are not preserved. + This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good
